-
-
Notifications
You must be signed in to change notification settings - Fork 3.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Merged by Bors] - change how to select bevy-glsl-to-spirv or shaderc #1819
Conversation
all(target_arch = "x86", target_os = "windows", target_env = "msvc"), | ||
all(target_arch = "x86_64", target_os = "windows", target_env = "gnu"), | ||
all(target_arch = "x86", target_os = "windows", target_env = "gnu") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Version of glsl-to-spirv
on crates.io, does not yet have the Support for these three Targets.
Either they should be removed for now, or Cart should release a new version of glsl-to-spirv
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just tried publishing the new version, but the new crate structure causes problems: cart/glsl-to-spirv#12.
Short term if we want to merge this asap we should assume we need to use the current version here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed them
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if we want to merge this
I opened this after seeing several people with issue around that, but none in the last few days.
31b3b6f
to
a3306d7
Compare
Co-Authored-By: MinerSebas <66798382+MinerSebas@users.noreply.github.com>
a3306d7
to
a46c35a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missed to suggest these two. 😅
Co-Authored-By: MinerSebas <66798382+MinerSebas@users.noreply.github.com>
This looks good to me. Not a huge fan of the conditional compilation complexity + large duplicated |
bors r+ |
`cfg` for `bevy-glsl-to-spirv` use now mimics https://github.com/cart/glsl-to-spirv/blob/master/Cargo.toml fixes #898 fixes #1348 fixes #1942 fixes #1078
Pull request successfully merged into main. Build succeeded: |
`cfg` for `bevy-glsl-to-spirv` use now mimics https://github.com/cart/glsl-to-spirv/blob/master/Cargo.toml fixes bevyengine#898 fixes bevyengine#1348 fixes bevyengine#1942 fixes bevyengine#1078
cfg
forbevy-glsl-to-spirv
use now mimics https://github.com/cart/glsl-to-spirv/blob/master/Cargo.tomlfixes #898
fixes #1348
fixes #1942
fixes #1078